I think this addresses all my issues. If anything else pops up we can fix it once we have a known problematic environment. Reviewed-by: DJ Delorie <dj@redhat.com>