Some unix-* updates