Build and database corrections

title