fixups, demo labs