Small changes missed in last commit