Fix some Natars issue