More sphinx updates