Minor cross OS fixes.