Fixes to Octave mode