fix deployment error and script error

[mkzyk]

1. Deployment error fix. It's a same as others pull request.
2. Emergent fix for script error when component is loaded.

[salesforce-cla]

Thanks for the contribution! Unfortunately we can't verify the commit author(s): Kazutaka Tsuji <k***@s***.com>. One possible solution is to add that email to your GitHub account. Alternatively you can change your commits to another email and force push the change. After getting your commits associated with your GitHub account, refresh the status of this Pull Request.