Fix some notes etc