More cross platform adjustments