Fixed non-function changes pulled in from master