Minor fixes and changes/