Fix pointer -> db move