Fixes to database scheme
Fixes to evolution script