Fixes, Speed optimizations