Fixes to make OTP generator run under new VM