Fixes for new mechanism for RDBMS module