Some more fixes to composer.json