Fixes for version 8.4 of matlab.