First round of fixes for ESC14 environment.