Some more fixes

I'm making too many commits, sorry :(