Further November 2014 tweaks