Fixed JSL issues.