Minor fixes for sles and ole7