More Cogglets changes