Minor adjustments after refactor.