Fix load issues for guests