Simple fixes

I think the commits are really self-explanatory.