Minor documentation and demo fixes