escaping fixes

Change-Id: I72bef68890988ae125d8202e3516786785d763ba