Unix porting fixes