Tidyup for RC1