Miscellaneous composer updates