Some adjustments to improve docs