Tweaks + fix accept4