Change interrupt code, add stub for inc_r