SQLs fixed