Fixes for Linux