Fixed quality issues