More optimizations and consistency