Fixes after Linux fixes.