Fix some issues found by landscape

improved "quality" from 80% to 84%