Fixes for double-quoting