Fixes
Cache-improvements here and there