Minimal performance improvements