'make format' fixes