Some tweaks for packagist