Fix data missing bug for builds.
Cleanup
Unbreak some more.