Fix some issues with trustees.