Made some paths more explicit.