A few more fixes to make unix socket handling work properly