* [EL_SCRIPT,SC] Updates to stay in line with new AP code (from PGC).