Fixes last paths, and clean up