Correct getter calls following change to underlying model