Fix quote problems