Minor speed enhancements