More sphinx hacks