Pull in interrupt and other minor updates