Small fixes arised during the class