Conform to language changes in Beta 5