Fix non-demo mode, various tweaks
Release 0.9.26