Minor fixes and modifications for official repo.