Linux specific fixes