Small fixes for the sql files so that db creation goes well