Updates to match recent code changes