Add some fix to models