Few fixes for Linux