Fix crashes, remove pesky double quotes