Sort out the last two memory issues.