Fixing landscape reported issues.