small fixes for RC 25