more mdb fixes