Repairs to both structural and non-structural parts or incidental alterations may be made in a building or other structure substantially occupied by a non-conforming use, or in connection with a permitted change or extension of a non-conforming use.