Some fixes for the distribution, test-examples still doesn't work