Fix a couple more edge cases