Notebook fixes and other tweaks