Tweaks due to impending demo