Fix some more formatting issues