Few minor updates