cgi fixups for acutal serving