Notes to self, composer fixes