Fix OTP 17

The Fix OTP 17 pull request for exo needs to be applied before this pull request.