Fixes to the AutoMatrix implementation. Goal is compilation and back-compatibility with the rest of the code.
More fixes to the AutoMatrix effort