Fix a few issues from the refactoring and fix existing data