Some fixes related all with composer