Some more overflow checks