Fix all 7.7.3 rebase errors