Fixed notation issues