[git pull] some fixes for -rc1