Bug fixes, use --mangle-toplevel in uglify