Latest fixes (2.7.154, and some bugs reverted in the scripting)