Update some paths and minor fixes