Updates to shcJSL2/3 and Machina