Fix some multicall portability issues (5.8.2)