Fixed up some minor bugs

Need to fix VAS and media references