Fix issues with JS.