Fix issues with the model that I noticed when doing examples