Cleaned up everyone's merges a bit