Small Bug Fixes with DB names