[4.2] Various Database Fixes

Fixes incorrect types in docbocks, incorrect cs in tests.