Added fixes from Desktop