Fixes/Optimizations