Fixed a few issues related to quotes