Fixes from Desktop