Some fixes. Just see it