EDD fixes and media fixes