Some bugfixes and codechanges inside droplets.