More oversight fixes