More cross platform fixes