Adds minor performane enhancements