Some more autoreg fixes
Small fix
Merge pull request #629 from zeeman/autoreg_prelim2

Some more autoreg fixes