Fix NaN in some notebooks
Add Q034