Fixes to platform for linux