Apply @dcarral corrections