fixes from state template