Corrections for compose type handling