Minor fixes and changes ...