Part of the bounds checking bugs found by the Stanford checker.

The 4 fixes below have been acked by their maintainers.