Updates to match new code.