Cleaning up a few typos to let tests run