Mvdb/hot bugfixes