More linux fixes