Fixing some minor bugs in the refactoring