fixed some warnings, executable of prev changes
Authored by: phomm 2016-02-26
Parent: [r414]
Child: [r416]