Hard-wrap fixes