CGI fixes