Few Minor fixes