Some minor fixes done