Sweets integration, minor fixes till better times