Fix errors in cmdr/state in previous checkin - fixes build issues