Few minor fixes. V1.01