Some Minor fixes