Bug fixes

Whoops