Fix remaining load issues.