Trivial changes and composer support