Minor fixes�