Fixed jshing issues