Fixed loading order issues.