Active state fixes