Fix a few goofs.

This gets module data save working.