Some fixes after review during the class