Fixed more autonomous problems