Cleaning up a little bit, mostly fixing paths