Some fixes before adding to packagist