Quick fixes to play nice with OTP 17.