Fixes for notebooks and R