Fix composer validation issues and branch aliasing nonsense