Fix Issue #346 and #438: various composition part pass through issues