Fix additional compile time warnings.

Signed-off-by: darkestkhan <darkestkhan@gmail.com>
Merge branch 'dev' into darkestkhan