Fixing up media creation
Fixing up media connect