Composer fixes and trying to stabilise