Linux fixes to windows porting changes.