Merged some diffs from the hlte tree.