Some tweaks to the generated result