Updated minor changes from desktop.