Bugs Fixes, which lead to error when JS Minifier