Fixing oddities that "somehow" slipped through