Model: Fix a few mistakes