Some additional changes to get fix the sparse format issue. These fixes are based on getting the notebooks to work correctly and are not necessarily the best solution.