Finish off the last tweaks of the composer PoC sys