Minor tweaks for demo purposes