More memory error fixes, it's still a steaming pile of shit, it might
be time to change direction...