Fixes for linux build
More tweaks