Fixed minor state changes