Fixes for linux compilation