Fixed Minifier issues