DataNode
Adding fixes for datanode