Dev refactoring bugs