Adds more fixes to models