Some more LCF improvements