More minor UNIX fixes