Fix a few larger issues.
- Hai Mom.