more Matlab compatibility changes