Updated and fixed some paths