Packagist fixes