Integrate mods from old bitbucket repo.