Fix a few Performance issues