Further doc fixes