WK2P4 Fixing more scripts