Minor update from dev branch