Fix some notation bugs.