TWIN: Fix a few model issues