LibNoDave fixes from 0.8.5
but not the complete source yet updated...