Minor fix and master.sql regenerated