Various tweaks to the compiled output and reported