Fix
Fix
LOL
More optimizations.