C0103 fixes 4, datastore and db_store changes

This PR is dependent on #1110.
Of course not. Better safe than sorry. Will do the changes now and resubmit.