Also fix the MAIN_TYPE