JS issues resolved