TWIN: Fix a few little things