#108258: Minor changes so it deploys easier.
Merge pull request #14 from luisromangz/108258-DeploymentFixes

#108258: Minor changes so it deploys easier.