Moved a few objects to unique_ptr

These used to be aligned properly, now they just have random spaces.