Add new bootstrap samples and fixes for existing samples