porting back some errors/inconsistencies noticed in fedora4 development

these cases don't come up often (or possibly at all) in fedora 3, but they have been wrapped to prevent any errors.