TIMOB-14399-Additional changes to original pull request

Added additional changes as per the review comments in the original request.

https://jira.appcelerator.org/browse/TIMOB-14399