Media handling fixes.
Fix places bug.