More off-by-one errors fixed.