Github collision changes and bugfixes.