Small notebooks fixes