Few minor improvements