Minor fixes to DB schema
Tidied up