Minor fixes and database additions