Formatting and error reporting tweaks