Moar format fixes