Various autonomous code fixes