Improve Nop and fix wrong buffer on killing bug