Fix several complains about formatting