Correct some errors from 1da989e