Fix compliance checker for states
and events