Fixes to make an usefull model