Further tweakings