Improve paths