Add composer and other fixes