Moved a few objects to unique_ptr

Space missing.