More fixes related to state loading.