More cross platform tweaks