autonomous fixes