A few more edge cases