[datacontrol] Fix a few issues