I made some fixes with K2 r167 and tweaked the metadata layout.