notice fixes, for now using @ to suppress some strange notices
Merge pull request #1345 from kurund/CRM-13107

notice fixes, for now using @ to suppress some strange notices