Fix up for new branch