FIXES FOR DB