Few MDB validation tweaks