Fixed up some model functions not being classmethods