--notice fixes for CRM-12018

Notice fixes