fixes for octave