Minor changes due to memory bug.