Small control updates