Fixes for latest jmacro