More changes for k200

--dropping emplace :(