Some fixes were done