more make_unique stuff