Fix some warning messages
Merge branch 'jpiper-develop' into develop