misc r2014b fixes