4.1.80: Fixing some layout and another memory management issue.