Fixes for Linux operation