Media server and small fixes