Javascript Client fixes