Tiny changes that were necessary after rebasing onto the current DNA master