Add next chunk of fixes

Going roughly a third at a time.