Added CoreMatchers back in (now not autogenerated) and removed compile warnings.