fix some more errors in Oct2014