more mdb compatibility fixes