Pulling in some changes from forks