Fixed some issues related to HDK configuration.