fixes for RC 30 C