TEMP: Fixes for various typos after moving code