Merge "Fixes some typos in tempest"