Small fixes to composer