Octave fix

Trying to bring together the different `octave` build issues and their fixes.