Quality fixes for week of Nov 4, 2013. Closes #821