Some updates to fix errors.