Missing changes that didn't make it into the initial commit