[fixes] post refactorization fixes