More Minor fixes