Contribution controller fixes by yours truely