Add fixups to script output