Hardened/current/pull requests/devnexen

Just some additional overflow checks