Resolved FIXMEs in DBHelper. Added asserts