Fixed several performance issues refs #17422