A few more fixes, mostly formatting issues