Fix JS merge errors