After populating DB, fixes.