Few final updates