Remove media added and some fixes.