post model fixes