Morphis/compositor fixes