Fix more platform specific failures