fix BC refactoring issues