Fix still more overflow problems.