Fixes concerning annotation style overrides