Further RC3 cleanup and enhancements