fixes for defects 003 - 008