More fixes prior to 2014Q4 release