Minor tweaks and demoMonkey steps