Fix more api checkout problems