Insight fixes, composer fix