Fixed all platform humbug