matlab fixes, removing octave-specific syntax