Fix Refactor Errors