Fixes for hamcrest upgrade