Fix SQLAlchemy issues with initial model