Tweaks, before updating to use vdom