Fixing a bunch of errors from earlier betas.