fixes some more cross platform issues