- Structure handling fixes.