Few fixes done