Minor fixes and modifications