More services and fix for media