Fixed up some changes that have been brought in by one of the Beta releases.