Some fixes and modif