Fixes for RC 2