Update to new formatting calls
Fix some minor issues