Fix things from the merge with @mikeubell