Minor fixes and changes...