Composer fixes