Very small performance improvements