Fixes to the static/media issues