Provided some fixes for escape utilities.