Various DRY cleanup
Force a vcs update in green build