Updates to keep up with drake changes.