more platform fixes