Remove last warnings
Refs #6
Fixes bug when persisting database (hopefully!)
Refs #6