Begin fixing load issues