Fixes to composer