Fix some bugs of refactoring from last commits