Minor build/escaping fixes