more fixes on drop2-compose2