Fixes for formatting