Rolling in various changes