Fixes in loading/initialisation order