few more bugs from darwin sysv merge