Fix quotes bugs