Fix a couple off errors in earlier series of commits