Memory allocation fixes.