Fixes on media controller