Fix interrupt issues