Last tweakings