Autumn 2013 bug fixes

Adds bug fixes applied in production during Autumn 2013 to version control.