Some small changes to the load procedure