Increase metadata size and swap out type for gen/mark