Fixes for activation notice