various fixes for sunflower integration