state: fixes