Issues from extension trait changes

Should make master green again.