Fix clientside JS issues