minor escape fixes