Fix for 2.1.5
Cleanup the mess
Path case
merge pocesar for minify 2.1.5