Final fixes for RC1