Deal with some more edge cases