Fixed a few issues with quotes