fixes based on mdb-schema output on debian