Minor fix
Improve the condition for cgi-api fallback behavior
Minor fix