Cleanup. Path corrections