More performancetweaks
Fix pathes