A few fixes plus minify removal