fixed post-refactoring warring issues