Fix some js conflict issues.