Small changes, pre-branch commit