Fix missed refactors