Fix notebook & activities