Fixes for linux to make tests pass