Some minor performance and memory updates.