More Octave compatibility fixes wrt catch