[4.2] Various Database Fixes

Fixes incorrect types in docbocks, incorrect cs in tests.
Note that this is a bug fix because the callback shouldn't be required.