Add bundle and fix install