Fix parameters and references