revert advertiser to default
Fix compile-time annotation type checking