Fix composer dependency issues