A few fixes and loading of models