[Matahari] [PATCH 2/5] Resolve a couple of compiler warnings.