Minor tweaks to prepare for rc1 release