Minor optimizations and consistency updates.