Removed some R2014b incompatibilities.
Fixes for R2014b were not backwards compatible