Improvements to autoactivate