platform specific fixes