Fixing several commands - particularly media workspace handling.