Demo: some fixes