Fixes

Whoops, that was a bit too save ;)