some more fixes to build
Updated Database