Urgent fixes for broken rc3 release