Server cgi options fixes