Tweak composer.json, fix specs