Some fixes after reviewing