Minor DBMS fixes