Fixing notices see BT#6329