Fixes for escaped characters in customer codes