[trunk] Fix two simple warnings about sign mismatch