Add some more projection optimizations