Fixes for 3.0 rdbms integration