bug fixes [trigger:composer]