Updates to match changes to the codebase