* Some fixes to InfoSystem and loading.