Switch back to C interrupt handler; fixes from class