Really fix some NetBSD issues