Fix load issues