Various Minor fixes