Multiple changes required for proper use of vanilla world