Minor touches for older LO versions