Fix further overflows.