Demo fixes

Nothing extravagant here, just some things that have annoyed me.