Various final changes for demo build