Some fixes after AVSmal's notes