Many fixes for clean loading media methods and functions