Bug fixes
Whoops. This is in the wrong spot.