Fix up after merging with my view model changes