Some fixes done