More updates for ESC14 environment.