R2014b changes

Fixed for R2014b.