SQLMaker fixes