Fix compilation warnings
Merge branch 'dev/chuck/MEM-FIX' into testing