Latest Classic/Remora amends from upstream