Few minor modifications.