Few fixes found from writing the doc