Fixes to get past some initialization problems.