Some fixes after the first presentation