Trying to fix some initialization order hiccups...