small fixups, added diffs from strace