Exadios branch: Small corrections.