Minor fixes, demo stuff