Memory warnings fixed