Handle more dodgy headers