fix a few issues with the data engine refactor