Fixes for R2014b