Fix arithmetic operation wrapping