Small adapter refactorings