DDBEASY 101  - Warning/notice fixes.
Merge branch 'DDBEASY-101' into development