Fix issues with new struct layouts.