Changes to get it working with current NXT version