Small fixes for Linux