Better Fixes for #1293
Make sure the core annotation are getting installed