Minor fixes exposed by libuv