A bit more formatting fixes