Small adjustments for Unix* after Windows edits