UNIX-style fixes