A few tweaks to make things correct for packagist