More fixes
Notation commit