Droplet state fixes