More model loading fixes.