Change some more OTP stuff