Even more fixes

Somehow the last commit didn't actually commit everything