Additional fixes due to E-Release updates