Finding some more edge cases to get out of the way