Added some path cleaning