HDFS stuff fixes