Bufixes for last commit (problems with escape sequences).