Formatting fixes, mainly to test continuous build