Fixed bugs in the data-generator and fake communicator.