Fixes for Catch.