Fix some quoting issues