Fix-up loading ...