Composer bug fixes