Fix for Trait auto-load issues.