Minor improvements in NetBSD