HDFS support, minor improvements