Final (?) tweaks for RC1