More sphinx tweaks