Some fixes according to modal
Some fixes according to modal