Change parameter positions in couple helper methods