Ultimately fix escape bugs.