Few tweaks post demo