Fixes SMOKE test issues up to this point