Fixes for Panics API