More fixes to sphinx plugins