Minor fixes to 2014-11-10