Fixes for linux env