Fixed compile warnings
Merge remote-tracking branch 'TC/master'