A few more formatting fixes