Rotator fixes

Additional media support