some -1/+1 fixes