No need for all that path stuff. Other path fixes too.