Optimizations/tweaks.