fix warnings
Merge commit '98fcb29f47d353c098a8b60da6140c7808d973ae'