These two changes are NOK