Fix invalid references and remove superfluous parenthesis