Trailing fixes for v1.7 (config syntax, set_states)