Using generic ISR declarations to fix Jenkins builds