Misc fixes

Great job with the MATLAB module! For the first time, I tried out the module on our C++ project that uses SWIG and the result was encouraging! Not compiling yet, let alone running, but no major showstoppers.