Tweaks for composer support.