Minor fixes for R2014b.