dbap fixes