Fix more exports