Code review changes per Mark and Ioan