models: fix models a bit