Fix Orm\Builder inconstistencies.