Fixed few auto to correct