demo: small code tweaks