Bug fix and updates that were missed from gh import