Fix invalid reference and comments