Add branch rename workarounds