Bug fixes due to the transition to the new struct package.