Made fixes for Linux