Minor fixes done