Replicating AbrarSyed fixes