More off by one changes