Patching up odd cases