Minor changes to handle multiple autonomous better.