More dbo refactor bug fixes.