Bug fix: Minify tricky JS