some path cleanups.