Some minor changes for better docs