Optimizations and meta tweaks