fixes for flexible components