Few final tweaks