Fixing up some paths