merge latest bugfixes from MirBSD CVS