[fix] couple of refactoring errors