Fix custom matcher messages
Fix abort callback calling