Various autonomous fixes