small escape fixes