Final tweakings