Fix save-and-* rendering