Fix missed refactor functions