Some fixes improvements