Cleaning up paths and such...