Fixed harbour QA issues.