Add missing states, build fix for master