Small fixes for R2013b