minor fixes for composition