Formatting and fixes.