Corrected wrapper locations