Change Schema name, fix small issues