Bug fixes for 2013 week 48

Minor fixes

Added missing meta charsets
Merge branch 'bugs-2013-W48'