Phone demo misc changes