Fixes for successful phar creation