[WFCORE-225] Update scripts for various issues found and general cleanup

Synchronizes the scripts with several changes that happened in EAP.