Fixed some things, preparing for transition to new annotation plugin system