Additional Fixes
merged base
Merge pull request #46 from ppicinic/base.smoke

Additional Fixes