Minor tweaks + fix composer.json